3df86240b035bb870203c08aa61b090db21cf677,grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java,GrailsDomainBinder,bindRoot,#HibernatePersistentEntity#InFlightMetadataCollector#String#,1369

Before Change


            TenantId tenantId = entity.getTenantId();
            String defaultColumnName = getDefaultColumnName(tenantId, sessionFactoryBeanName);
            String filterCondition = ":tenantId = " + defaultColumnName;
            root.addFilter(filterName,filterCondition, true, Collections.<String, String>emptyMap(), Collections.<String, String>emptyMap());
            mappings.addFilterDefinition(new FilterDefinition(
                    filterName,
                    filterCondition,

After Change



        if(entity.isMultiTenant()) {
            TenantId tenantId = entity.getTenantId();
            if(tenantId != null) {
                String filterCondition = getMultiTenantFilterCondition(sessionFactoryBeanName, entity);
                root.addFilter(GormProperties.TENANT_IDENTITY,filterCondition, true, Collections.<String, String>emptyMap(), Collections.<String, String>emptyMap());
                mappings.addFilterDefinition(new FilterDefinition(
                        GormProperties.TENANT_IDENTITY,
                        filterCondition,